(font-lock-hack-keywords):

Handle next-single-property-change returning nil.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index a2b5b7d1c4e65ada62cd0d12f6e1bd52a8cab98c..5081874ca904af9bbc33c6d1c041ff13d4d24be8 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -310,7 +310,7 @@ slow things down!")
                    (narrow-to-region s e)
                    (while (not (eobp))
                      (let ((next (next-single-property-change (point) 'face)))
-                       (if (> next (point-max))
+                       (if (or (null next) (> next (point-max)))
                            (setq next (point-max)))
                        (if (not (get-text-property (point) 'face))
                            (put-text-property (point) next 'face face))